Update OOjs UI to v0.1.0-pre (1c7875205a)

New changes:
a14026f Move some styles to the Apex theme
9df7af9 Add basic styling for Agora theme
deefcf3 Localisation updates from https://translatewiki.net.
1c78752 Add initially enabled ToggleButtonWidget to demo

Local changes:
* Change local update script so that it also copies oojs-ui-agora.css.

Change-Id: I77e6876899809db3f6e246579f82c1bf8bc51a45

diff --git a/resources/oojs-ui/i18n/hi.json b/resources/oojs-ui/i18n/hi.json
index 8b79d34..3c41b3e 100644 (file)
--- a/resources/oojs-ui/i18n/hi.json
+++ b/resources/oojs-ui/i18n/hi.json
@@ -4,11 +4,13 @@
             "Ansumang",
             "Devayon",
             "Rajesh",
-            "Siddhartha Ghai"
+            "Siddhartha Ghai",
+            "Goelujjwal"
         ]
     },
     "ooui-dialog-action-close": "बंद करें",
     "ooui-outline-control-move-down": "प्रविष्टि नीचे ले जाएँ",
     "ooui-outline-control-move-up": "प्रविष्टि ऊपर ले जाएँ",
+    "ooui-outline-control-remove": "आइटम हटाएँ",
     "ooui-toolbar-more": "अधिक"
 }
\ No newline at end of file

diff --git a/resources/oojs-ui/oojs-ui-agora.css b/resources/oojs-ui/oojs-ui-agora.css
new file mode 100644 (file)
index 0000000..6fbd7f4
--- /dev/null
+++ b/resources/oojs-ui/oojs-ui-agora.css
@@ -0,0 +1,52 @@
+.oo-ui-window-head {
+  height: 3.35em;
+  border-bottom: 1px solid #dddddd;
+}
+
+.oo-ui-window-body {
+  padding: 2em 3.35em;
+}
+
+.oo-ui-window-icon {
+  width: 3.35em;
+  height: 3.35em;
+  background-size: 2em auto;
+  border-left: 1px solid #dddddd;
+}
+
+.oo-ui-window-title {
+  line-height: 3.35em;
+}
+
+.oo-ui-buttonedElement.oo-ui-indicatedElement .oo-ui-buttonedElement-button > .oo-ui-indicatedElement-indicator,
+.oo-ui-buttonedElement.oo-ui-iconedElement .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon {
+  width: 3.35em;
+  height: 3.35em;
+  background-size: 2em auto;
+}
+
+.oo-ui-optionWidget {
+  padding: 0.8em 1em 0.8em 3.35em;
+  font-weight: bold;
+  border-bottom: 1px solid #dddddd;
+}
+
+.oo-ui-buttonOptionWidget {
+  padding: 0;
+}
+
+.oo-ui-menuItemWidget.oo-ui-optionWidget-selected {
+  color: #ffffff;
+  background: #347bff;
+}
+
+.oo-ui-menuSectionItemWidget {
+  font-weight: normal;
+  color: #777777;
+  border: none;
+}
+
+.oo-ui-textInputWidget input,
+.oo-ui-textInputWidget textarea {
+  padding: .8em 1em;
+}
\ No newline at end of file

diff --git a/resources/oojs-ui/oojs-ui-apex.css b/resources/oojs-ui/oojs-ui-apex.css
index 66a8072..f86f67c 100644 (file)
--- a/resources/oojs-ui/oojs-ui-apex.css
+++ b/resources/oojs-ui/oojs-ui-apex.css
@@ -42,6 +42,11 @@
   box-shadow: 0 0 0.66em rgba(0, 0, 0, 0.25);
 }
 
+.oo-ui-frame-content {
+  font-family: sans-serif;
+  font-size: 0.8em;
+}
+
 .oo-ui-toolbar-bar {
   background: #f8fbfd;
   background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #ffffff), color-stop(100%, #f1f7fb));
@@ -89,7 +94,19 @@
   color: #000;
 }
 
+.oo-ui-window-body {
+  padding: 0 0.75em;
+}
+
+.oo-ui-window-icon {
+  width: 2em;
+  height: 2em;
+  margin-right: 0.5em;
+  line-height: 2em;
+}
+
 .oo-ui-window-title {
+  line-height: 2em;
   color: #333;
 }
 
@@ -105,6 +122,8 @@
 
 .oo-ui-buttonedElement.oo-ui-indicatedElement .oo-ui-buttonedElement-button > .oo-ui-indicatedElement-indicator,
 .oo-ui-buttonedElement.oo-ui-iconedElement .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon {
+  width: 1.9em;
+  height: 1.9em;
   opacity: 0.8;
 }
 
@@ -428,6 +447,10 @@
   box-shadow: inset 0 0.07em 0.07em 0 rgba(0, 0, 0, 0.07);
 }
 
+.oo-ui-optionWidget {
+  padding: 0.5em 2em 0.5em 3em;
+}
+
 .oo-ui-optionWidget-highlighted {
   background-color: #e1f3ff;
 }
@@ -475,6 +498,10 @@
   white-space: nowrap;
 }
 
+.oo-ui-buttonOptionWidget {
+  padding: 0;
+}
+
 .oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected,
 .oo-ui-buttonOptionWidget.oo-ui-optionWidget-highlighted {
   background-color: transparent;
@@ -519,6 +546,7 @@
 }
 
 .oo-ui-menuSectionItemWidget {
+  padding: 0.33em 0.75em;
   color: #888;
 }
 
@@ -560,8 +588,13 @@
   box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.2);
 }
 
+.oo-ui-textInputWidget {
+  width: 20em;
+}
+
 .oo-ui-textInputWidget input,
 .oo-ui-textInputWidget textarea {
+  padding: 0.5em;
   font-family: sans-serif;
   font-size: 1em;
   background-color: #fff;

diff --git a/resources/oojs-ui/oojs-ui.js b/resources/oojs-ui/oojs-ui.js
index 19bcdfe..524524f 100644 (file)
--- a/resources/oojs-ui/oojs-ui.js
+++ b/resources/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0
+ * OOjs UI v0.1.0-pre (1c7875205a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: Mon Mar 24 2014 17:35:46 GMT-0700 (PDT)
+ * Date: Wed Mar 26 2014 09:53:51 GMT-0700 (PDT)
  */
 ( function () {
 

diff --git a/resources/oojs-ui/oojs-ui.svg.css b/resources/oojs-ui/oojs-ui.svg.css
index b546253..23fb48b 100644 (file)
--- a/resources/oojs-ui/oojs-ui.svg.css
+++ b/resources/oojs-ui/oojs-ui.svg.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0
+ * OOjs UI v0.1.0-pre (1c7875205a)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: Mon Mar 24 2014 17:35:46 GMT-0700 (PDT)
+ * Date: Wed Mar 26 2014 09:53:51 GMT-0700 (PDT)
  */
 
 /* Textures */
@@ -158,11 +158,6 @@
   background: none;
 }
 
-.oo-ui-frame-content {
-  font-family: sans-serif;
-  font-size: 0.8em;
-}
-
 .oo-ui-toolbar {
   clear: both;
 }
@@ -232,23 +227,14 @@
   -webkit-touch-callout: none;
 }
 
-.oo-ui-window-body {
-  padding: 0 0.75em;
-}
-
 .oo-ui-window-icon {
   float: left;
-  width: 2em;
-  height: 2em;
-  margin-right: 0.5em;
-  line-height: 2em;
-  background-position: right center;
+  background-position: center center;
   background-repeat: no-repeat;
 }
 
 .oo-ui-window-title {
   float: left;
-  line-height: 2em;
   white-space: nowrap;
   cursor: default;
 }
@@ -287,8 +273,6 @@
 .oo-ui-buttonedElement.oo-ui-indicatedElement .oo-ui-buttonedElement-button > .oo-ui-indicatedElement-indicator,
 .oo-ui-buttonedElement.oo-ui-iconedElement .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon {
   display: inline-block;
-  width: 1.9em;
-  height: 1.9em;
   vertical-align: middle;
   background-position: center center;
   background-repeat: no-repeat;
@@ -717,7 +701,6 @@
 .oo-ui-optionWidget {
   position: relative;
   display: block;
-  padding: 0.5em 2em 0.5em 3em;
   margin: 0;
   list-style: none;
   cursor: pointer;
@@ -832,7 +815,6 @@
 
 .oo-ui-buttonOptionWidget {
   display: inline-block;
-  padding: 0;
   background-color: transparent;
 }
 
@@ -934,7 +916,6 @@
 }
 
 .oo-ui-menuSectionItemWidget {
-  padding: 0.33em 0.75em;
   cursor: default;
 }
 
@@ -1056,7 +1037,6 @@
 
 .oo-ui-textInputWidget {
   position: relative;
-  width: 20em;
   -webkit-box-sizing: border-box;
      -moz-box-sizing: border-box;
           box-sizing: border-box;
@@ -1066,7 +1046,6 @@
 .oo-ui-textInputWidget textarea {
   display: inline-block;
   width: 100%;
-  padding: 0.5em;
   -webkit-box-sizing: border-box;
      -moz-box-sizing: border-box;
           box-sizing: border-box;

diff --git a/resources/oojs-ui/update-oojs-ui.sh b/resources/oojs-ui/update-oojs-ui.sh
index 6cf631f..edc7425 100755 (executable)
--- a/resources/oojs-ui/update-oojs-ui.sh
+++ b/resources/oojs-ui/update-oojs-ui.sh
@@ -78,7 +78,7 @@ NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse --colo
 cd -
 
 # Copy files from dist/ to resources/oojs-ui
-cp -a $1/dist/{oojs-ui.js,oojs-ui.svg.css,oojs-ui-apex.css,images,i18n} resources/oojs-ui/
+cp -a $1/dist/{oojs-ui.js,oojs-ui.svg.css,oojs-ui-apex.css,oojs-ui-agora.css,images,i18n} resources/oojs-ui/
 # Figure out what the new version is
 NEWVERSION=$(oojsuiversion)
 # Generate commit summary